Fix a typo in the previous commit.

2007-06-26  Emmanuele Bassi  <ebassi@gnome.org>

	* gtk/gtkfilechooserdefault.c (list_mtime_data_func): Fix
	a typo in the previous commit.

	(shortcuts_append_desktop): Remove unused variable and
	hush the compiler warning.

svn path=/trunk/; revision=18249

diff --git a/ChangeLog b/ChangeLog
index c10eb4d1ecdfb189a30cb4978056db88e7b68af6..42e3dc8c8e4ce7f2cacb74be1e1cbaa3cda8b7a9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-06-26  Emmanuele Bassi  <ebassi@gnome.org>
+
+       * gtk/gtkfilechooserdefault.c (list_mtime_data_func): Fix
+       a typo in the previous commit.
+
+       (shortcuts_append_desktop): Remove unused variable and
+       hush the compiler warning.
+
 2007-06-26  Emmanuele Bassi  <ebassi@gnome.org>
 
        * gtk/gtkfilechooserdefault.c (list_mtime_data_func): Show

diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c
index 0baec772975fa36292c8edc8f105c8c4b02c1ac3..96063a72e8c237437ab852c699fb53ee8020cbeb 100644 (file)
--- a/gtk/gtkfilechooserdefault.c
+++ b/gtk/gtkfilechooserdefault.c
@@ -1955,8 +1955,7 @@ shortcuts_append_home (GtkFileChooserDefault *impl)
 static void
 shortcuts_append_desktop (GtkFileChooserDefault *impl)
 {
-  char *name;
-  const char *home;
+  const char *name;
   GtkFilePath *path;
 
   profile_start ("start", NULL);
@@ -10971,12 +10970,16 @@ list_mtime_data_func (GtkTreeViewColumn *tree_column,
 
         if (!ptm)
           {
-            date_str = g_strdup (_("Unknown"));
             g_warning ("ptm != NULL failed");
-            goto done;
+            
+            g_object_set (cell,
+                          "text", _("Unknown"),
+                          "sensitive", sensitive,
+                          NULL);
+            return;
           }
         else
-          memcpy ((void *) &tm, (void *) ptm, sizeof (struct tm));
+          memcpy ((void *) &tm_mtime, (void *) ptm, sizeof (struct tm));
       }
 #endif /* HAVE_LOCALTIME_R */
 
@@ -11005,7 +11008,6 @@ list_mtime_data_func (GtkTreeViewColumn *tree_column,
        date_str = g_strdup (_("Unknown"));
     }
 
-done:
   g_object_set (cell,
                "text", date_str,
                "sensitive", sensitive,